Auto merge of #1936 - steveklabnik:gh1870, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:48:11 +0000 (22:48 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:48:11 +0000 (22:48 +0000)
commitba64c1fc1f45167814736d7b7dd168c037862a3c
tree390e08c85021f8a391a9205df5bdfa6e095dae85
parentca1b05fd159a19eae2739d563130c159a49ea390
parent630108d958d5bdea7a7546ea07ee7ed242e6255c
Auto merge of #1936 - steveklabnik:gh1870, r=alexcrichton

Fixes #1870